From f744d5aa339c800d08e45f5bec4f3b104bcbe8d4 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 2 Feb 2004 22:44:05 +0000 Subject: [PATCH] Don't access the level after removing the node, since that may kill the Mon Feb 2 23:41:48 2004 Matthias Clasen * gtk/gtktreemodelfilter.c (gtk_tree_model_filter_row_changed): Don't access the level after removing the node, since that may kill the level. (#132615, Crispin Flowerday) --- ChangeLog | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ ChangeLog.pre-2-4 | 6 ++++++ ChangeLog.pre-2-6 | 6 ++++++ ChangeLog.pre-2-8 | 6 ++++++ gtk/gtktreemodelfilter.c | 3 ++- 6 files changed, 32 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 59d145c36a..db628791e7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Mon Feb 2 23:41:48 2004 Matthias Clasen + + * gtk/gtktreemodelfilter.c (gtk_tree_model_filter_row_changed): + Don't access the level after removing the node, since that may + kill the level. (#132615, Crispin Flowerday) + 2004-02-02 Tor Lillqvist * gdk/win32/gdkevents-win32.c (gdk_pointer_grab): Set the cursor diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 59d145c36a..db628791e7 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +Mon Feb 2 23:41:48 2004 Matthias Clasen + + * gtk/gtktreemodelfilter.c (gtk_tree_model_filter_row_changed): + Don't access the level after removing the node, since that may + kill the level. (#132615, Crispin Flowerday) + 2004-02-02 Tor Lillqvist * gdk/win32/gdkevents-win32.c (gdk_pointer_grab): Set the cursor diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 59d145c36a..db628791e7 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +Mon Feb 2 23:41:48 2004 Matthias Clasen + + * gtk/gtktreemodelfilter.c (gtk_tree_model_filter_row_changed): + Don't access the level after removing the node, since that may + kill the level. (#132615, Crispin Flowerday) + 2004-02-02 Tor Lillqvist * gdk/win32/gdkevents-win32.c (gdk_pointer_grab): Set the cursor diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 59d145c36a..db628791e7 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +Mon Feb 2 23:41:48 2004 Matthias Clasen + + * gtk/gtktreemodelfilter.c (gtk_tree_model_filter_row_changed): + Don't access the level after removing the node, since that may + kill the level. (#132615, Crispin Flowerday) + 2004-02-02 Tor Lillqvist * gdk/win32/gdkevents-win32.c (gdk_pointer_grab): Set the cursor diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 59d145c36a..db628791e7 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +Mon Feb 2 23:41:48 2004 Matthias Clasen + + * gtk/gtktreemodelfilter.c (gtk_tree_model_filter_row_changed): + Don't access the level after removing the node, since that may + kill the level. (#132615, Crispin Flowerday) + 2004-02-02 Tor Lillqvist * gdk/win32/gdkevents-win32.c (gdk_pointer_grab): Set the cursor diff --git a/gtk/gtktreemodelfilter.c b/gtk/gtktreemodelfilter.c index 89b7e1a57e..0c9c9031c2 100644 --- a/gtk/gtktreemodelfilter.c +++ b/gtk/gtktreemodelfilter.c @@ -1079,13 +1079,14 @@ gtk_tree_model_filter_row_changed (GtkTreeModel *c_model, { /* get rid of this node */ gtk_tree_model_get_iter (GTK_TREE_MODEL (filter), &iter, path); - gtk_tree_model_filter_remove_node (filter, &iter, TRUE); level = FILTER_LEVEL (iter.user_data); if (!level->parent_level) filter->priv->root_level_visible--; + gtk_tree_model_filter_remove_node (filter, &iter, TRUE); + goto done; } -- 2.30.2